Merge "Fix QS accessibility issues" into nyc-dev