Merge "Add gesture nav error state tracking and logging" into tm-qpr-dev