Merge "Use shortcut label for overflow conversation title" into rvc-dev am: 33f840317d

Original change: undetermined

Change-Id: Ied9c8695abf038a63a0f910f59e0163d8d3188f5