Fix patrolling where NP patrol isn't explicitly enabled

Hot fix! Follow-up fc5bcf1147f9

Change-Id: Iba7e70e1a1ddd9826f6e5f4022b88ccafc5f571d