Commit for toggle buttons using event listener

Change-Id: Ib28c3dbc39d4cc3ee6cb32ace07782a1b64e5304