Merge "Fix bug #5025936 TableLayout layout direction resolution is broken"