- cherry pick with button control event fix, now touchupinside