Merge "Update the visibility state of views in UserPreference properly." into nyc-dev