Merge "For headless system, also include UID_HEADLESS in current UIDs." into main