Merge "Fix crash when receive wrong intent"