Merge changes Ifbf07b27,Ic9cd89e8 into sc-dev

* changes:
  Notification color overhaul.
  Implement the new visual style of the expand button