Merge "[Magnifier-38] Avoid deadlock causing ANR" into pi-dev