am 0425de31: Merge "eliminate notification clicker garbage." into mnc-dev

* commit '0425de31cf9a2ad8e5883c64d27dc2ee90d0377c':
  eliminate notification clicker garbage.