Merge "Remove singleline for the nearby devices textview" into tm-qpr-dev