Added support for control events on top of the polling mechanism

Change-Id: Id5e9aba3c2df3defe2a5bfbded6506a374bc6004