Merge "libnativewindow: map remove extra '#'" into main