Merge "Restore window manager stack order on user switch." into klp-dev