Merge "Simulate handling of event when throttling" into pi-dev