Merge "Fix intent filter priorities" into nyc-dev