Merge "Fix bug #5904777 GridLayout should be RTL aware"