Merge "EGL: Use frameId instead of framesAgo for frame events."