[*][Scroller] merge from upstream revision 64051, but didn't accept data/theme/widget...