Merge CM display-caf into Slim