Merge "Changed doze-light timeouts" into pi-dev