Merge "Fix NPE in UserControllerTest#testFailedStartUserInForeground." into main