Merge "Don't draw the trigger w progress bar unless its finishing" into klp-ub-dev