Merge "Fix DeviceFoldStateProviderTest" into tm-dev