Merge "Remove NativeWindow and unused DVR functions"