Merge "Make QS tile lifecycle tests less flaky (hopefully)" into nyc-dev