Merge "Migrate to CompoundButton" into main