Merge "Remove the bubble if intent has an issue" into qt-r1-bubbles-dev