Merge "SF: Fix unit tests re-registering a display" into udc-dev