Merge "Fixing jumping HUN when starting swiping" into tm-qpr-dev