Merge "[Settings] Fix unable to accessing Fi"