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

Change-Id: I0b3f236124420329d211b742befaa31e4bed36d7