Merge "[Re-land] Implement two intents or shortcuts to active split" into udc-dev