Merge "Stylus scale - API review feedback" into mnc-dev