Merge "Unhide user disabled error for slicing and guard with feature flag" into main