Merge "Expand on gesture navigation error detection." into tm-qpr-dev