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

Change-Id: I549a844a9fdf1cc8ab480188c71005e7d47e54f4