Merge "Merge "Move bubbles top, manage button below" into qt-dev am: c8a97db0d9 am: 94a3028a40" into qt-r1-dev-plus-aosp
am: 42e7f68ac7

Change-Id: I6b6671dbe591dfb06f1ae0d46fd1bd0582560fb4