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

Change-Id: I431da0e6ffaa90f1071f9170b92bafcfdfa7ab30