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

Change-Id: Iba6b5597e4d56935d680bf117bed496a8063f597