Also remove preferences if app is installed, but disabled.

Change-Id: I7f23e7a05c336bd16cda3426c7b31922cb92e1b2
JIRA:CYAN-1861
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1