Merge "Do not call exit() immediately after serving sideload"