[automerger skipped] Merge "Only show "Connected" note after opening portal" into qt-dev am: 09a8de5530 -s ours am: 9cf034331c -s ours
am: ca4a7afaad -s ours
am skip reason: change_id I99be7d312d020d242081971c7e522023bbbab072 with SHA1 0b5a4d8621 is in history

Change-Id: I56aab52ccbda215d0481298b3546bfc27a0d62ac