Revert "Switch to display Caf"

This reverts commit 4e9374a29f00c36ca5e0c7d1bf9b00fd3182b784.

Change-Id: Ie0dabe86bbaa175a8fa17b05d1be930282c7d767