Merge "Replace DragView bitmap with drawable" into sc-dev