Okay, I finally got it to fix itself, but I don't really know what worked. After doing about the 4th Restart, and playing with every setting I could think of, I set the phone down and came back after the last restart was finished. Looked at it, and the camera is right side up again. Whew...