Merge "Use standard displayPreference" into pi-dev