Merge "Adapt CheckApfIsSupported for VSR-15 compatibility" into main