Merge "Return full bubble bar bounds on display when expanded" into main