Merge "Remove libnativewindow dependency" into main