Revert "Switch to display Caf"

This reverts commit 311dac25cd3bbe70f9c072f9eaac1cb9c5804a92.

Change-Id: I18fb11eb75b16f3fffa5a06acb2efb65762a3942