Merge "Fix bug #7374285  GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev