Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev