916369: Do not persist config changes until the action completes