Merge "Refactor virtual display creation and cleanup" into udc-dev