Merge "Simplify progress bar paths" into lmp-dev