Merge branch 'feature-kmc-kmw' into feat/developer/add-model-info-keyboard-info-to-kmc-build-activities