Merge changes Ibce9b3c7,Ib83a5666 into sc-dev

* changes:
  Restore guest item's original behavior in user switcher
  Fix animation bugs in keyguard user switcher