Remove superfluous write of ensureEventHandlersAreSetUp flag

Change-Id: Ie28f58ea7d7b92f9eced46d94490bde9df69daa5
Merge "Remove superfluous write of ensureEventHandlersAreSetUp flag"