Merge "Improvement for the Bubble Bar Bubbles' Shadows" into main