Merge "Changing the return type of takeScreenshot() (1/n)"