Merge "Fix VisibilityPreferenceControllerTest."