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

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