Merge "Fix SeedTest for landscape no auto-rotate screens" into jb-mr1.1-dev