Merge "Settings dashboard performance work" into nyc-dev