Connection buttons should not be showing up when home realm discovery is enabled

This is reopen of Connection buttons when logging in with Organization

It is clearly a bug. Please provide workaround.