Merge "Rename home to settings home" into nyc-dev