automerge: 4ed8a33
* commit '4ed8a336efc76847fbf3e11a0ae66aa74c422846':
Make window mgr stack movement track activity mgr
automerge: 4ed8a33
* commit '4ed8a336efc76847fbf3e11a0ae66aa74c422846':
Make window mgr stack movement track activity mgr