Issue #3219034: D9 compatibility

Peter Thorndycraft requested to merge issue/show_as_expanded_always-3219034:3219034-d9-compatibility into 8.x-1.x Jun 16, 2021