Merge "StorageManagerService: increase watchdog timeout." into main