Merge "surfaceflinger: fix per-frame metadata to be per-layer" into pi-dev