Merge "UI fixes for the progress bar and handle display density changes" into main