Merge "Allow for SDK 26 Activities to specify orientation when not fullscreen." into oc-dev