Issue #2398465 by DickJohnson, emma.maria, jp.stacey, idebr: Clean up the "contextual" component in Bartik