Merge "Fixes to WearableActionExtensions" into klp-modular-dev