Merge "Fix bubble expanded view width after rotation" into main