Merge "Cache StrictMode handle to IStorageManager" into main