mdss: cleanup merge
defconfig: enable kcal