Merge "Fix QS edit accessibility" into nyc-dev