Merge "Updates to swipe interaction" into jb-ub-mail-ur8