Merge "hwc: Use layerIndex while populating hw layers"