Merge "SF: Plumb physical display IDs to libgui"