- cleanup and move marker_no_index into the shared area For: #10317
km_core_state_context_set_if_needed