cherry-pick ipad fix