Merge "Make logging optional when checking for heads up" into tm-qpr-dev