Merge "Fix getting settings package name" into rvc-dev