Remove one layer of overdraw from cards

Change-Id: Id3cb2a946d7fb0cd1f440aff115c86671c9b0eef
3 files changed