am d68cd8cc: am 41bf03e1: Merge "Restore window manager stack order on user switch." into klp-dev

* commit 'd68cd8cc40226dfd0b63227b6c186de4a4fd9ba0':
  Restore window manager stack order on user switch.