Merge "surfaceflinger: fix a potential child layer leak" into oc-dev