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

Change-Id: I7f6b5de964d319ad1f1c4daeb01994658f64fbe4