am ee5f04f1: am 434f2fbc: am 65d0a198: am 1c13ff56: Merge "Handling label and icon from SessionInfo." into ub-now-porkchop

* commit 'ee5f04f19d6440810dae7d03e04cce3edcd9a83c':