Merge "Check if WindowInfosListener is present during remove" into udc-dev