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: 9f5a5156" into rvc-d1-dev-plus-aosp am: 8095d14c
Change-Id: I930e0222177a08cdc4630f03a77b2d35322a9620