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

Change-Id: Iaaa49536da3c71d367bf5745f35e8cdd81f34711