Merge "Doze: Fix trigger sensor re-registration." into lmp-mr1-dev