Merge "SnapdragonCamera: Fix live shot image stretch when recording is 4K" into camera.lnx.1.0-dev.1.0