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

Original change: undetermined

Change-Id: I801b9c40633fc88ae44a01262aeff9fd91bb63ab