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

Change-Id: I601fde5804a921a9e634e342993402d4feb8031a