Merge "Ensure Surface is recreated if children are detached." into pi-dev am: 7311bbd70b
am: b12f236e41

Change-Id: I9540936a79eaa616dbc7d7d2cf259846d7b8cd28