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

Change-Id: I9b4fb988b6db2cd16a5e78a67ab53948746d6488