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

Change-Id: I4c88e00788211188af495830221caea0c030b3b8