Merge "Use application context in DeviceFoldStateProvider" into main