Merge "Fix hung input event while resizing"