Merge "QS Edit: Fix up accessibility" into nyc-dev