Merge "Update stack position after a bubble is removed" into tm-dev