Merge "Revert "When adding event listener, use fuzzy window for last event time."" into qt-dev
am: fcd744fdee

Change-Id: If60b03c3709d40be02f9a1cb6cbc31c4e102a2ff