Merge "Add summary to Enable Plugins setting" into honeycomb