* commit 'd2c4487acc4da13e622fac86faeff024ce10acfb': Add a missing condition when checking measurement for ActionBarContainer
* commit 'd2c4487acc4da13e622fac86faeff024ce10acfb': Add a missing condition when checking measurement for ActionBarContainer