Merge "Correctly set thread group to UiThread's thread." into oc-dev
am: 479bb430d1

Change-Id: I59b38f14864d12aff442cdf5a92b64a56c35dc19