Merge "New device config to enable location perm re-up"