Merge "Fix: policy enforcement for location wifi scanning" into tm-dev