Merge "Revert "Remove NativeWindow and unused DVR functions""