Merge "Remove remember from Preference.onClick" into main