Merge "Update bubble bar bounds in shell" into main