optionally add the events buffer as a workaround for Samsung devices
merge