Merge "Avoid over-damaging layer area for multidraws" into mnc-dev