Merge "Clear selection mode when changing root" into nyc-dev