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

Change-Id: I6c53bff8ecc906658a3f8e81acfb6cb2e241121a