Move payload_manager.notify_commit to after commit (#15361)