Merge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev