Merge "Cancels loading when moving out of Favorites screen" into rvc-dev