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

Change-Id: I60bfe040712bb24f1dc2d4ceb6210e15c1cf18f6