Bug 1025053 - [Camera] Fix odd classes being added to controls