Merge "[User Switcher] dismiss dialog appropriately." into tm-qpr-dev