Merge "Pass handling context when invoking resolved click handler"