Merge "Fix camera race condition" into qt-dev am: f2c4f55435
am: 56c7b69a38

Change-Id: Ie888a35dd9e3cd31ff8dd4cc6ec3826ed5ca9eec