display-caf: update to match upstream cm-10.1 branch

Merging was not possible as there were too many changes between the branches. Even the CM guys just overwrote the branch history by force pushing.