Merge "Switch from getActivity() to getContext()" into nyc-support-25.2-dev