Merge "Propagate the display id with SysUIState changes to launcher" into main