Merge "Switch to the same user as the current user on the test device" into main