Merge "NativeWindow: implement functions expected by AIDL" into main