Merge "Add version of @UiThreadTest that works at class level"