am 0f2f9f7a: Merge "Stylus scale - API review feedback" into mnc-dev

* commit '0f2f9f7a51a43ef8ca1d977f62cf649d08d6ec84':
  Stylus scale - API review feedback