Merge "SnapdragonCamera: Reset navigation bar state whenever screen turns on"