fix the cut off of slider view.
Merge remote-tracking branch 'origin/master'