Revert "Switch display variant from CAF to default"

Camera don't work

This reverts commit f67af115e25a0c5752f6a6383a7ddf5d1447312f.

Change-Id: I50172a980ecc4cbd508739cb43cfc86446d978df
Merge branch 'cm-11.0' into martincz