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