Merge "Remove TODO for animating bubble bar view" into main