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