Merge "QS - Fix race condition in accessibility"