Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev