am 5deccb85: am cb3b976d: am 2ad136df: Merge "Fix (another) measurement issue in ActionBarContainer" into lmp-dev

* commit '5deccb852328dd2c0ce2d307740bbe765bd83e25':
  Fix (another) measurement issue in ActionBarContainer