Merge "Handle focused tasks on multiple displays"