Issue #8595 by tuj: Added this to channel and screen controllers as well.