Fixed when the notification effects are being cleared

Previously the notification effects were not correctly cleared in certain
cases and the user could end up in a state where the notification light would
always blink.

Bug: 22931139
Change-Id: I9a71e56cf4479354a9d773b5b6f0edd7693f2b05