am 2b0db74a: am 4d696690: Merge "Fixed a bug where redacted notifications had...
am 2b0db74a: am 4d696690: Merge "Fixed a bug where redacted notifications had the wrong height" into mnc-dev
* commit '2b0db74a':
Fixed a bug where redacted notifications had the wrong height