Merge "Show conversation guts when HUNing" into rvc-dev am: 161cdc30 am: a43d3edf am: 522bf879 Change-Id: I5a69e908c2f7317c739db3caa5f3d0a7039105ff