Merge "Fix bubble expanded view jumping to the left when switching bubbles" into tm-dev