Merge "Fixed issue where camera wouldn't launch" into qt-r1-dev am: 58432a11f7
am: 15a4d3a29f

Change-Id: I46127ad69bf095eb6018308e084817fce89b0ec8