Merge "Fix button visibility on connect"