Merge "Fixed an issue where a notification could flicker" into oc-mr1-dev