Merge "Improve multi-window render clipping logic" into nyc-dev