Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev