Merge "Add onClick for CardPreference" into main