Merge "Fix calls to captureScreen"