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