Fixing scheduler transactions

* Multiple events are created within a single transaction

Change-Id: I1ad1122cf4080de41e704420ca89874e42148f3e
Merge "Fixing scheduler transactions"