[automerger skipped] Merge "DO NOT MERGE Adding additional null checks for BubbleController." into qt-qpr1-dev am: 297a84231f
am: 3ef3661221 -s ours
am skip reason: subject contains skip directive

Change-Id: Id0817609c91ddb905dac4caad01dd1c0615f12c0