[Anonymity] Added back NeffKeyShuffle