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

Change-Id: I7acc2344c75a41d883c4404f204513f60f541279