Merge "StorageManager: remove old isFileEncrypted* methods" into main