Merge "Bubbles / notifs / shortcuts: if the id's don't match throw an error"