Merge "Increase event queue limit to 4000" into mainline-prod