Merge "Fix issue #3194697: default orientation for portrait-mode apps on stingray is backward?"