Merge "Fix UI corruption in landscape mode" into jb-mr2-dev