Merge "Fixes user switcher dialog animations."