Merge "camera3: Update sceneMode tag spec."