Cleaned up merge and put in possible fix for reading parcel in SavedState(Parcel in)