Merge "Fix the input info missing for SurfaceView" into main