Enable new power modes

Change-Id: I0c2a6fbc5a22aa869896077149cdb05fb0c488e5
display: Switch to the qcom/CAF variant

Change-Id: I953566f896b251afbbb4f2e8d4ddc4695da9bb6b
Merge branch 'cm-10.2' into martincz