Bug 933939 - [Camera] [Meta] 1.3 Code Refactoring