Merge changes Idfd40156,Ic903fc25

* changes:
  Make user-switch transitions customizable
  Add support for custom user-switch UI