Merge "intent.collectExtraIntentKeys only required when there are extra Intent" into main