Merge "Explicitly mention again that startCommand() runs on the main thread." into gingerbread