Always do cherrypick + rom name fix