Merge "Fixed issue where camera wouldn't launch" into qt-r1-dev