Merge "Cleanup some unused code and update resources on config change" into rvc-dev