Merge "Camera: Add initial flagging support" into main