Merge "Check API values only if modem supports APIs" into main