Merge "Fix NPE when registering gesture support"