Merge changes from topic "hiddenCameraDeadlock"
am: c52243f298

Change-Id: Iced231eeaf55af13dfff514f21ce3398cdbd6a0c