Merge "Properly update profile connection state"