Merge "Avoid restart when inserting/ejecting adopted." into nyc-dev