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

Change-Id: I2f17f2bd2f293f2c68ba20fbfd6aa3e693f8b865