am f532871e: am 1bbaeaa4: am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev

* commit 'f532871ec4cecd63e760706fbb8871bc1c65583b':
  Improve GridLayout's weight calculations