Merge "Ensuring multi-window callbacks contain new configuration and are in order" into oc-dev am: 34ecbaa991
am: 0ed0b685b4

Change-Id: I925a568a4bde9eaab06b227690094c6099b7dfff