Merge "Merge "[Magnifier-87] Fix deadlock causing ANR" into qt-dev am: 9550c185 am: 104a254b" into qt-r1-dev-plus-aosp