Merge "Bubble v2 layout changes."
am: 79a26290ab

Change-Id: I06b5b2bf3a38e7b626b411c54a1a495711007cdc