Merge "surfaceflinger: fix z-relative layer destruction" into oc-mr1-dev