Revert "Switch to display Caf"

This reverts commit e7dda347d4bf871b40c76adf1a58c91e6eb74050.

Change-Id: I1910c5fb732b296579b4facff5517309434b5be8