Merge "Separate natural display orientation for configuration" into main