Merge "Check that onAttach() is called before onResume() to prevent NPE." into main