Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev