Merge "fix link context menus" into honeycomb