Merge "Refactor common logic in bubble pin controllers to base class" into main