Merge "Fix trigger sensor lifecycle"