am d65eebf4: Merge "Fix scaled-view droppings artifact" into jb-mr2-dev

* commit 'd65eebf4d97dd3812f02e7755e5b399c27e49f71':
  Fix scaled-view droppings artifact