Merge "Fix NPE when WindowManagerDebugConfig.DEBUG_SCREENSHOT is true" into nyc-dev