Merge "Prefactor to remove un-used ContextMenuAdapter."