Merge "Correctly set thread group to UiThread's thread." into oc-dev