Merge "Use WindowInfo to calculate visible windows" into udc-dev