Merge "VpnSettings: bind OnPreferenceClickListener later."