Trapping of oil drops in a noncircular pore throat and mobilization upon contact with a surfactant