Merge "Cross fade escalation card when content changes." into nyc-mr1-dev