Merge "Initialize last-orientation to ensure we don't skip loading config." into oc-dev