Merge "SF: Support xy scaling for rounded corners" into tm-qpr-dev