Revert "use caf-rebase of display-caf"

This reverts commit 85bec5fa6359445ad8e82aa7bfd76ad6337c6955