Merge "Add an opt-out property for camera compat freeform treatment." into main