Merge "Address ASurfaceControlInputReceiver comments" into main