Merge "QS - Fix race condition in accessibility" into nyc-mr2-dev