Merge changes from topic "clock-carousel-view-model" into udc-dev

* changes:
  Make clock carousel extend ViewModel
  Fix race condition for clock carousel