Merge "Skip loading contextual cards if legacy cards are used" am: c53771e80a am: 81e9c58691 am: 9dbbf88d14
am: 6f99052cbc

Change-Id: Ie582c8628b267c26de965d6c990a3998e6f6d277