Merge "Update active gesture error detection" into tm-qpr-dev