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

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