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

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