Merge "[DO NOT MERGE] Adjust multi-window UI for InCallUI <100% modes." into nyc-dev