[automerger skipped] Merge "Ensure each dot contains only relevant notification to the shortcut and displays system shortcut when long click on deep shortcut." into ub-launcher3-qt-qpr1-dev
am: 9447e887 -s ours
am skip reason: change_id Idc9eaed55e900ed4027a43ee9c3fd7dc6f4480b2 with SHA1 0cd5bd5f is in history

Change-Id: I6320f2cdf7260e49c64ca5295d4db2c0ab611702