Added support for control events on top of the polling mechanism

Change-Id: Ic6de6f8500333b9a4ea67d354107f6762c6a77f6