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

Change-Id: Ib2c2681f6c219d5b8206280341904effe104b540