Merge "Fix measurement regression in ActionBarContainer" into lmp-dev