Merge "Whitelist camera permission for SetupWizard" into nyc-dev