Merge "Fix unit test for PreferenceController"