Merge "Do not change task's stack in resizeTaskLocked"