Merge "Fix assertion in VisibilityPreferenceControllerTest."