Merge "Bubble v2 animation improvement." am: d806c2321e
am: ee384fa0de

Change-Id: Ib39f13a9494dafcb315228296ae2e1d7b80b306e