Merge "Merge "Refresh both lists and pinning preferences on change." into rvc-dev am: 582aeba5 am: 45b4885a am: 0dfb5908" into rvc-qpr-dev-plus-aosp