Merge "Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba50c am: 45b4885a90 am: 0dfb5908be" into rvc-qpr-dev-plus-aosp