Merge "Fixes for restoring more than one child surfaces" into nyc-dev
am: 7e7449f18a

* commit '7e7449f18af5485fd49d9401fb887435224ebde2':
  Fixes for restoring more than one child surfaces

Change-Id: I28a7688752c8e90887002d0be0c7bed0523ce433