Merge "Revert "Set trusted overlay on SurfaceControl instead of InputWindow"" into main