Merge "Allow more time to un-blacklist strongest satelite" into pie-vts-dev