Merge "Fix padding for conversation app name" into rvc-dev am: 520d7c586b am: 48094c3a18 am: b83ad3d7c0 am: 27c0072f10

Change-Id: I9bd8eb19713c7aaac911f23f6ea4b81713ccc977