Merge "Only show Bubbles link for messaging apps" into rvc-dev am: 73b6bfc1e8

Change-Id: Ied54b377c639d4beeff1d0f576f426f55b110fdc