Merge "Correctly determine when to show details cell." into nyc-dev