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

Change-Id: I3e05c8c127c021dc321b0ef130159ff7a021a9e8