Merge "Find task on preferred display first"