Merge "Fix StorageManager stack use after scope." into pi-dev