Merge "Adding orientation preserving resizing"