Merge "Use setVisible instead of removePreference everywhere."