Merge "QS: Fix accidental a11y tile removal" into nyc-mr1-dev