Merge "Consistent portrait/landscape spacing"