Merge "Replace legacy StorageManager check" into main