Merge "Do not wait for window with alpha=0" into udc-dev