Merge "[Settings] Remove the unexisted subinfo from map"