Merge "Fix RTL horizontal spacing in Gridview" into lmp-dev