Merge "Fix orientation test and improve its instructions" into jb-mr1-dev