Un-caf display

Change-Id: I0046ec9fd820f41d8528d62cab929761e468fa30
Some carbon stuff

Change-Id: Ica5d4ac5cc3686a84d267d44f60727a7c9861ab8