Merge "Backup system QS tiles" into nyc-dr1-dev