Merge "Fix NPE in ResourceUtil.isSharedWithGit()"