Merge "Remove favorites when app is uninstalled" into rvc-dev am: 35886c0d47 am: 7f381cfaa2

Change-Id: I0e443613f25e394ffae0ea9b800d255dd8172b10