Merge "Fixed an icon flickering when adding a notification" into oc-dr1-dev