Merge "Remove favorites when app is uninstalled" into rvc-dev