Merge "Add navigation mode overlays to GSI targets" into main