Merge "Add the secondary provider hand-over logic"