Merge "Bubble v2 animation improvement."
am: d806c2321e

Change-Id: I360eadaec4ddbf3dcca50e73bc5d74f945f5f455