Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread