Merge "Fixed an issue where a notification could flicker" into oc-mr1-dev am: b338f034e9
am: 9a6205a5ab

Change-Id: Ic65a1187832bf7f33209564b9a13443e3ea69d89