Rebased for merging into 2.x along w/ some code cleanup and support for all types of intents, not just card.