Merge "Clear out old views when setting new content in settings" into nyc-dev