Merge "Added test for camera orientation" into jb-mr1-dev