am cf1df421: am 70782a0d: Merge "Adjust scrollbar to not overlap with list of city clocks" into lmp-dev

* commit 'cf1df421c70523e5cd4b8a4751ca0e1f514d9f91':
  Adjust scrollbar to not overlap with list of city clocks