Merge "Revert "Migrate to CompoundButton.OnCheckedChangeListener"" into main