Merge "Skip moving the focused Task to top if it is already on top" into tm-qpr-dev