[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 am: 1eaf39d7 -s ours
am: 64cb971b -s ours
am skip reason: change_id I99be7d312d020d242081971c7e522023bbbab072 with SHA1 0b5a4d86 is in history
Change-Id: Id475694f1f99eb5067b1763ee7a8632f7d1e41b3