Merge "Fixed the animations of Messaging Layout, leading to overlaps" into pi-dev
am: d982210d89

Change-Id: I4b29f82656e3b3402f89cb5d66e71955287ac0b8