Merge changes Ia6156d7c,I396ac936 into nyc-dev

* changes:
  Fixed a bug with autoredacted custom views.
  Fixed a bug where notifications could become all white