Merge "check surface valid before screenshotting wallapper"