Merge "Don't cache QS custom tiles across users" into nyc-dev