Merge "Update todo to point to a correct bug" into tm-qpr-dev