Merge "QS - Fix race condition in accessibility"
am: 302efd6125

Change-Id: I13c4959fde96684c52124ff8809d6921fc404a42