Merge "Add SKIP_SCREENSHOT flag instead of using the window type."