Merge "Adjusted margins for progress bar." into jb-ub-mail