Merge "Camera2: override UI options when scene mode is enabled"