Merge "Fix QS CTS failure caused by tile backup" into nyc-dr1-dev