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

* commit 'fe28ff0d063818762dd585a67fcffd61cabd5a2f':
  Fix for regression in WindowManager orientation changes