Merge "[Settings] NullPointerException when disable eSIM/Fi" into rvc-dev