Merge "Use Wi-Fi state cache in Internet Panel" into tm-dev