Bug 1060500 - [camera]  on startup
Merge pull request #23774 from justindarc/bug1060500-v2.1

Bug 1060500 - [camera]  on startup