Merge "Mark UserControllerTest.testStartUser_background as @FlakyTest"