Merge "Surfaceflinger: Propagate type & UID from parent layers" into oc-dev