am 55093c43: Merge "Handle scaling correctly when drawing with shader" into lmp-mr1-ub-dev

* commit '55093c43cc8b6a6553895c2e6084b6f82c0fbcc8':
  Handle scaling correctly when drawing with shader