am 750e73c4: Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad

* commit '750e73c4a4b04a5695540d3c982774662307b58e':
  Measure all children to ensure correct layout position