Merge "Use the safe `getDisplayId()` API when building the recents desktop task list." into main