Merge "ui: Pull PhysicalDisplayId into its own header"