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

Change-Id: Ic4fa8c211100fe6ff68d60cd314cd51d535888e0