Merge "Settings: Fix sometimes reset progress dialog not dismissed"