Merge "Convert skpCaptureEnabled compile time flag into a property"