Merge "Camera2: Update sceneFlicker tag spec"