Merge changes from topic "hiddenCameraDeadlock" am: c52243f298
am: 8863a154f8

Change-Id: I0974cb11a70bfd0a325e24a559872093c19b4fe5