Merge "SnapdragonCamera: Match video and preview sizes for all HFR modes"