Merge "Refresh both lists and pinning preferences on change." into rvc-dev