Merge "Send input event id to SurfaceFlinger" into sc-dev