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

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