Merge "Consider tasks with INVALID_DISPLAY as it's on DEFAULT_DISPLAY" into main