Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev