Merge "Fixed bubble bar size for the 3 buttons navigation mode." into main