Merge "Fix assistant shortcut on phone shortcut helper." into main