Merge "Improve multi-window render clipping logic" into nyc-dev am: c79c324 am: 2554b09
am: d424d50

* commit 'd424d505580ef745228f04dba40a55cfa9dc7876':
  Improve multi-window render clipping logic

Change-Id: Idf950bb645d4702e68cffce93f7badef6e50b800