Merge "Fix QS edit view accessibility classes" into nyc-dev