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