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

Change-Id: I76277d167b4d3ff98b224d7f395b5a393e470176