Merge "Bubble v2 layout changes."