Merge "Prevent notifyScreenshotError() from calling twice" into nyc-mr1-dev