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

Change-Id: I0f40b4bf35c8cc516eef9da37a7988f79bde6f1b