Merge changes I237e0f04,I51ef1c1a into sc-dev

* changes:
  Fix the (still disabled) logic for re-theming custom view notifications
  Clean up the material notification theme definition.