Merge "Fix NPE in UserManagerService when calling isUserInitialized()." into main