Merge "[Magnifier-60] Fix race condition after #dismiss"