Merge "Clean bluetooth code" into tm-qpr-dev