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

Change-Id: I45b867f913c8882e4df1f0bcea29d970f10042a7