Merge "Fix early call of UMS.removeUser causing system crash during boot." into main