Merge "Add a missing condition when checking measurement for ActionBarContainer" into lmp-dev