Merge "Fix mistakenly swapped hot spots for horizontal resizing."