Merge "Start removing Dependency.get(UiOffloadThread.class)"