[automerger skipped] Merge "show dot on shortcut when incoming notification...

[automerger skipped] Merge "show dot on shortcut when incoming notification contains exactly the same shortcut id" into ub-launcher3-qt-qpr1-dev
am: 6d09a777 -s ours
am skip reason: change_id Iddf4cfe8ad60c12e8de8b171bed392f1bb0a6761 with SHA1 559dd806 is in history

Change-Id: I8ae385066547894c13c3e2497c9bbe6cd53b7199