Merge "Bubble settings: feature, notification, app" into rvc-dev