Capillary Heterogeneity Trapping and Crossflow in Layered Porous Media