Merge "fix ScreenshotsOfProtectedBuffersFail"