Merge "[els_scroller.c] Removed unwanted merge codes."