Fix the SavedstateHandle and added a function to restore the mapping object from savedstate handle (commit: 560ab8a)