Merge "Fix WindowInfosListenerTest" into udc-dev