Fix "lv_timer.h" includes in dev (#1943)

* Fix "lv_timer.h" includes

* Kick CI

* Merge incoming changes

* refactor(scroll): lv_obj_scroll_to_obj -> lv_obj_scroll_to_child

* kick CI

Co-authored-by: fvanroie <cpt_jack@msn.com>
Co-authored-by: embeddedt <42941056+embeddedt@users.noreply.github.com>
Co-authored-by: Gabor Kiss-Vamosi <kisvegabor@gmail.com>

library.properties

@@ -1,9 +1,5 @@
 name=lvgl
-<<<<<<< HEAD
 version=8.0.0
-=======
-version=7.8.1
->>>>>>> master
 author=kisvegabor
 maintainer=kisvegabor,embeddedt,pete-pjb
 sentence=Full-featured Graphics Library for Embedded Systems