Merge "[Settings] Avoid rename inactive subscription from NullPointerException" into rvc-dev