Merge "Move UiThreadTest annotation to class"