Merge "Ensure connect device button is shown" into main