Merge "Remove the divider on "Pair new device"." into sc-dev