Merge "Ignore orientation changes during VideoViewTest" into jb-mr2-dev