manifest: remove cherry-picks
these are merged
manifest: use display-caf from TeamHackLG