Merge "Fix NPE: due to race condition between KCM package update" into main