Merge "Track frame events incrementally and per layer."