Merge "Cancels loading when moving out of Favorites screen" into rvc-dev am: 6e2d2206d1

Change-Id: I41deeaa78cd295f3745428c323a73644cd1fc4c5