Merge "Ensure connected display ids in sysui are correct on boot" into main