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