Merge "Support scaled cutout & roundedcorners when resolution is overridden" into tm-dev