Merge "Add the check for UID presence to Display#hasAccess()"