Merge "Merge "Cancels loading when moving out of Favorites screen" into...
Merge "Merge "Cancels loading when moving out of Favorites screen" into rvc-dev am: 6e2d2206 am: e8dfdd58" into rvc-d1-dev-plus-aosp am: 41b8043c
Change-Id: I104c9a971aab19f02f39dffae322f392e217c0a1