Merge "Wrap all exceptions/crashes while plugins are active" into oc-mr1-dev