Cherrypick NLA Pullback fixes