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

Change-Id: Id307ac9e12d95dcd3d8bae9e983f969af979f6b3