Merge "Add notification id for dock setup notifications." into tm-qpr-dev