Move declaration of $storage['plugin_label'] outside of if statement to fix missing plugin_label problem
Closes #3481622