Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev