DO NOT MERGE Adding additional null checks for BubbleController.

Bug: 145155858
Test: Manual
Change-Id: I1f68423816aaa48a0040623488ee69237b372149
1 file changed