Merge "StorageManagerService: fix names of user lifecycle methods" into main