Merge "Modify Screen Capture Disabled APIs"