Added bubble style setup.
Changes for #1348502: Adding bubble and pill style.
Merge branch '7.x-4.x' into issues/2241967-preferred-services