Merge "SnapdragonCamera: Fix preview window race condition."