Merge "Fix back taking multiple swipes." into tm-dev