Merge "Revert "Fix user switcher flicker."" into udc-dev