Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev