Merge "Fix failing testCrossProfileIntentFilters test" into rvc-dev