Merge "Bubble settings: feature, notification, app" into rvc-dev am: 6585f79439 am: 93bc19e3a0 am: 00d5412626 am: cd1477ad07
Change-Id: I8c58ad93fcbbc5167b16020d86604f0ea147f82b
This commit is contained in: