Merge "Remove SPN & display condition override from IccRecord"