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

Change-Id: Ib4c0be9e07b58a7eab54ee1b6d1f52ea178042c1