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