Merge "Camera: Add flagging library imports to autogenerated files" into main