Merge "Fix IntentHandler behavior"