Fix the case where a scroll view exists within the keyboardTriggerOffset threshold.
Merge branch 'prevent-collapse-under-target' into for-consumption