Bug 1014110 - [Camera] Lazy-loaded controller references are not kept
Merge pull request #19490 from justindarc/bug1014110

Bug 1014110 - [Camera] Lazy-loaded controller references are not kept