Merge "Add new class for WiFi restractions caching" into sc-v2-dev