Merge "Harden construction sites of android::Surface." into main