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

Change-Id: I99be7d312d020d242081971c7e522023bbbab072