Merge "Support starts a pair of intent/shortcut and task to split" into tm-qpr-dev