Merge "Use new handover intent actions." into jb-dev