halo merge to activitythread