Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev