Merge "Handle scaling correctly when drawing with shader" into lmp-mr1-ub-dev