Merge "Shift the points that go outside the start/end of the progress bar." into main