Merge "Fix KS crash when trying to create a second LOHS."