Merge "Enable improved user separation by default."