Merge "Swipe: use event times to check for expiration rather than handlers." into rvc-dev am: 22eadd2455

Change-Id: Ib040c59823bb271344a0c160e506a0fa2172b7a2