Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev