am f249c3ee: am ccba036d: Merge "don\'t clear notification effects in response to peeks" into mnc-dev

* commit 'f249c3ee7be56438a3f9ff287f90c44ed7a56c19':
  don't clear notification effects in response to peeks