Merge "Update enforce intent filter match implementation" into main