Merge "Clean up virtual camera flags from the camera framework" into main