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