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

* commit '33be275deb072ca3e6155b61370578b16dbee64a':
  Fix scaled-view droppings artifact