Merge "Fix deadlock in showing Toast for sensitive content" into main