Merge "Reset Cards as they come into view" into nyc-dev