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

Change-Id: Ibc187ca717d054612e598c7be5b349daa1332428