Merge "Use orientation to determine size compat bounds"