Merge "Fix WindowInfosListener_test" into udc-dev