Merge "DO NOT MERGE Update setting to be bubbles not badging" into qt-qpr1-dev