Fix block selection (ContextHandler now in core), and make changes to adjust to stop caching plugin discovery/info hooks by language (#2281905)