Merge pull request #9485 from crdlc/bug-867149

Bug 867149 - landscape or landscape-secondary orientation locked apps re...(cherry picked from commit 1683b36b1e5b488a9b0e95679141a0019a4e37fb)