Merge pull request #17572 from steveck-chung/bug-986465

Bug 986465 - [Messaging] In list of messages to delete, contact name overlaps the photo. r=borja(cherry picked from commit 0aaacfb35bc914814904a02a49e1abb9a56ac099)