Merge "Use CopyOnWrite ControlListingController callbacks" into main