Merge "Fix unlock problem in split system user mode"