Merge "Skip loading contextual cards if legacy cards are used" am: c53771e80a
am: 81e9c58691

Change-Id: I09b7f37f094c24144b0448f2e7f820cffd5ddadd