Merge "Use standard displayPreference" into pi-dev
am: eba0723a57

Change-Id: I1394513d9d57577af2a5e0a253ff6ecb548e936d