Merge "Remove the isCustomCard and related codes"