Merge "Update the card table scanning for header-only card marks." into gingerbread