Merge "[Magnifier-87] Fix deadlock causing ANR"