Merge "Revert "Unregister WindowInfosListener in destructor"" into udc-dev