Merge "Fix disabling of tiles that are not relevant" into nyc-dev