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

Change-Id: I9b78412ef7115a3e71cfe11766713787def4c6d4