!act Marked StashWhen* marker traits as internal API (backport)

(cherry picked from commit 8f57f12)