Merge "Introduce WifiDisplayCertPreferenceController"