am 6b205498: am 1aa39ebf: Merge "Simplify progress bar paths" into lmp-dev

* commit '6b20549853d03f62f33c048049e148a250e6101f':
  Simplify progress bar paths