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