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

Change-Id: I2897744d2b741d629c35ce8b922a5eacbb927c63