Merge changes I313240f1,Ie2b830d0 into udc-qpr-dev

* changes:
  Remove setalpha(0f) from reset.
  Revert "Fix user switcher flicker."