Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439
am: cc3d0501f1
am: d097110f43
am: 9f33509a9e
Change-Id: I4274b8eb43ebb008e894f7a696c05cf07d7c6610
This commit is contained in: