Merge "Fixes for restoring more than one child surfaces" into nyc-dev