Merge "QCamera2: Avoid RAW+YUV for preview during video recording"