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: e8dfdd58" into rvc-d1-dev-plus-aosp am: 41b8043c am: a8ebe5f2
Change-Id: I47163ecda005e444a000af2d8f3c51b7fc45816f