[automerger skipped] Merge "DO NOT MERGE Update setting to be bubbles not...
[automerger skipped] Merge "DO NOT MERGE Update setting to be bubbles not badging" into qt-qpr1-dev am: 0afaedd5
am: 4b25085e -s ours
am skip reason: subject contains skip directive
Change-Id: Ia743e2c0be3ceaed3eb0a1cfc0f50acb54751482