Merge "Camera2: Update 4M wide picture size to be 16:9"