Merge changes from topic "bubble_settings_wooo" into rvc-dev am: c026d54cd7

Change-Id: I6e89aaa4ed1f331acc8e8b07dd8c01e07d564d62