Merge "Add the orientation hint test." into jb-mr2-dev