Merge "Add inputEventId to SurfaceFrame" into sc-dev