Merge "Fix bug with swipe-to-dismiss." into jb-mr1-dev