am 4d696690: Merge "Fixed a bug where redacted notifications had the wrong height" into mnc-dev

* commit '4d696690e6fb4059608d239624fde255c916b8e2':
  Fixed a bug where redacted notifications had the wrong height