Merge "Fix more jquery event shorthand usages"