Add support for edgesForExtendedLayout
Fix non-animated pop to root