Merge "DO NOT MERGE Adding additional null checks for BubbleController." into qt-qpr1-dev