Merge "Position bubbles from right to left" into tm-qpr-dev