Merge "Fix the failing PreferenceControllerContractTest"