Merge changes Id6f54480,I7f18a560

* changes:
  Don't re-order users in the lock screen / quick settings user switcher.
  Mark/unmark activated state before the user switch begins.