Changes from comments in PR#535. Remove some imports in NotificationBuilderWithProgressBar