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

* commit '1bbaeaa4b5bab1a1eebb1e901292799c58fc5fe2':
  Improve GridLayout's weight calculations