Merge "Don't assume getActivity() is @NonNull"