Merge "Add @NonNull to OnCheckedChangeListener" into main