Merge "Sort running task by focus and visibility"