Merge "Fix a regression matching intents when action doesn't matter."