Revert "Switch to display Caf"

This reverts commit bc5b606c5b83a2544795eda334fb8eacd4aa0972.

Change-Id: Ica5ad2c04326f24183c705a918a0a97a4e909f14
Merge "Revert "Switch to display Caf"" into kitkat