Merge "Only show "Connected" note after opening portal" am: f2aa4ce4bd am: bad4d1c6e9
am: 0b5a4d8621

Change-Id: I2eaa815beba4240a8258202fc5fcaac1547cd1bc