Merge "Revert "Disable multiple user for corp-liable mode""