Merge "Switch two samples to "WearPlusShared" template" into klp-modular-docs