Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev