Merge "Fix NPE when setting bubble bar bounds" into main