am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev

* commit '8ae8500365e71c59cbe96f600371391ac8d245b8':
  Update scrollbars to match Material spec