Merge "Revert "[Settings] Avoid rename inactive subscription from NullPointerException""