Merge "Fix deadlock by not acquiring lock when reporting proximity" into tm-qpr-dev