Merge "Don't keep sensor listener while screen is off."