Merge "Delay grantDefaultPermissions until user's first start" into nyc-dev