Merge "Restore preferred activity filter if it not inside"