Revert "Revert "Bubble layer""

This reverts commit 95213d69caa06f608db3d68686ab9bc12877a993.
Revert "Revert "Revert "Bubble layer"""

This reverts commit 41c5900c12dacfaa66228f1fff7727ff1781822e.