Merge "SnapdragonCamera: HFR Crash on 720 120FPS with Camera 2" into camera.lnx.1.0-dev.1.0