Merge "Do not assume display is available when a task launches" into main