Merge "Don't allow swiping to HintState if we're already in HintState" into tm-dev