Merge "Correct errant entry in to DRAG_RESIZE_FREEFORM state." into oc-dev
am: 03e61aa9bb

Change-Id: I515d73407b9d38513102b67feaf3e2804567fcbf