Add back the conversation icon in the expanded view

The conversation icon now shrinks instead of disappearing
as does the face-pile. This also requirements some adjustments
for when the conversation is inside a group since the app
name disappears there.

Bug: 150905003
Test: add group conversations observe layout
Change-Id: I4c9af08cc6adbb1deea1b750a4fd20eaa06f087d