Merge "Add logging for swipe and timeout"