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

Change-Id: I5aa641b8ed1a13605f6311d10a06f964ede29522