Switch to CAF display variant

support for 4-layers is now merged into the kernel, use it

Change-Id: I06ad4476c4d78cbffeea5ef11f5924e818e62f6f