Revert "Revert "Restore preferred activity filter if it not inside""

This reverts commit fc93d732ae17f21338ce63dc1672082cc349a2e8.

Reason for revert: re-uploading with fix

Change-Id: Ica78710bfc40dfaac74152c7aec1985f6e19fd6c
3 files changed