Merge "Properly handling situation when display is added and removed instantly" into udc-dev