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