Merge "Revert "SnapdragonCamera: fix screen flash on resuming""