Merge "Switch Java calls to enableZ and disableZ; remove isRecordingFor"