Issue #1858862 by andypost, fuerst: Be more careful which which masquerade sessions get cleared when switching back.