mdss: more merge fixes