Merge "Use select syntax on from-text vs from-source static lib selection" into main