remove preferences in App Settings if apps are disabled or removed

Change-Id: Ie1bebf86fb2b923a271f1c6e1f223261a487e7c1