Merge "Camera: Add user tag field to CameraActionEvent" into tm-dev