Merge "Prevent notifyScreenshotError() from calling twice" into nyc-mr1-dev am: 221330f9f9
am: 137b7cb793

Change-Id: I2f04cb58e2e44cd088835c4b973ee8ea8e214469