Merge "Use realCallerId to check launch display for Bubbles"