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

* commit 'f6b825fdeab33b1c44f54b3a9f1d66ef96a0374a':
  Handle scaling correctly when drawing with shader