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 am: 9fbce43f
Change-Id: I9ca69d5ff88d094f344b139149adfa00ce766fad