Merge "[Magnifier-87] Fix deadlock causing ANR" into qt-dev am: 9550c185f9
am: 104a254b1a

Change-Id: I59972eeb42d858bf068f8d98b58fd19b90cedcd3