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

Change-Id: Iad8a77c985a61a60b732f1a429c41ae967708ae4