cm-12.0: Remove display-caf and media-caf removal