Merge "Remove QS tiles that get uninstalled" into nyc-dev