Merge "Refactor moveStackWindowsLocked()"