Merge "Don't persist description res ids as they are subject to change." into rvc-dev