Switch display variant from CAF to default

Change-Id: I406ac7e1edb2fe152cf6cc6d91508b12a6dc078d
Specify primary storage

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