Merge "Fix restoring surface for child windows" into nyc-dev am: c56ca11611
am: e7b5f3dc04

* commit 'e7b5f3dc041f86cc3ce5c5c776699bf3f47bd514':
  Fix restoring surface for child windows

Change-Id: I7a83f592b1d60243ad1d6c42fca833e881a2938a