Merge "Fix bug #7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev