Revert "Switch to display Caf"

This reverts commit 4f596b3e8c4e321677b7c77cd6eee1c4289f9b00.

Change-Id: Ie009d46c3e192dc69372a86ed2591147781426f3