Merge "Adjust scrollbar to not overlap with list of city clocks" into lmp-dev