Merge "Prefer the launch display to the source when looking for task/stack"