Merge "Settings tweaks" into nyc-dev