Merge "Revert "SF: throttle WindowInfosListener calls"" into udc-dev