Merge "Update the visibility state of views in UserPreference properly." into nyc-dev am: a3b2bdc144
am: a9cadaa52a
am: 062bf2708b
* commit '062bf2708b15b70ae08f3313f554a8b89eb62ece':
Change-Id: I369f61e24ecad5ce19ab57bd35a78c7be4742d56
This commit is contained in: