Merge "System crash during dismissing split in multi-user scenario"