Merge "Camera orientation test updates" into jb-mr1-dev