Merge "Update bubble bar pin controller after parent class refactor" into main