Merge "Settings: Better handling for disabled tiles" into nyc-dev