Merge "Fix: policy enforcement for location wifi scanning"