Merge "Doesn't re-sort app windows when move task to top"