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

Change-Id: I41ff9f07001854dcd57aedf9e74dd5fb919f0197