Merge "Fix root selection after search"