Merge "Make snapuserd recovery_available." into main