Merge "Convert IntentResolver data object to IntentFilter for comparison" into rvc-dev