Merge "Store jankListener and surfaceStatListeners by layerId" into sc-v2-dev