Merge "Adjust for device orientation"