[automerger skipped] Merge "Only show "Connected" note after opening portal"...
[automerger skipped] Merge "Only show "Connected" note after opening portal" into qt-dev am: 09a8de55 -s ours
am: 9cf03433 -s ours
am skip reason: change_id I99be7d312d020d242081971c7e522023bbbab072 with SHA1 0b5a4d86 is in history
Change-Id: I8ec96985154e8fedc64f6f9233930f2d1a9ee581