Switch display variant from CAF to default

Change-Id: I406ac7e1edb2fe152cf6cc6d91508b12a6dc078d