Merge changes Ia6156d7c,I396ac936 into nyc-dev am: 6c5dddfdcf
am: 9bb582c16f

* commit '9bb582c16fbb4f6b74bcc572d9e3d781e02b525e':
  Fixed a bug with autoredacted custom views.
  Fixed a bug where notifications could become all white