Merge "Don't do heavy work on UiThread." into oc-dev