Merge "Clear out old views when setting new content in settings" into nyc-dev am: ca4dc9a
am: 299a4c6

* commit '299a4c61d476647fea771f24068481d06feea144':
  Clear out old views when setting new content in settings

Change-Id: I62cfa80df4c383cba81bb41978022367b030497b