Merge "Catch IllegalArgumentException in stopScreenshot()" into p9.0