Merge "Timer sample app now uses Set a timer voice command instead of Set alarm." into klp-modular-dev