Merge "Support for weights in GridLayout"