Merge pull request #20461 from justindarc/bug1024753

Bug 1024753 - [Camera] Add Camera app to whitelistedUnifiedApps
Conflicts:
	tests/performance/startup_events_test.js