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