Merge "Make QuickExceptionHandler handle force-retry-instruction"