Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev