Merge "Fix broken test testImIntentCustom"