Yes, and I think yes but I would need to test it to be sure. I do know the contributions disappear if you only have public contributions enabled and then turn a repo private but if you have private enabled then as long as the contributions still map to your ID it should show up. Does it not work that way for you?