Merge "Update the proximity feature to return proximity levels" into tm-qpr-dev