Merge "Ignore orientation changes in EGL test activity" into jb-mr2-dev