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