QS - Fix race condition in accessibility
am: acf90acf13

Change-Id: I8ecbc3f40c58dd56f94c00a452a6d84461ee698e