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