Merge "Allow context menu items to be handled properly."