Merge changes Icc9c36f7,I723474e2 into oc-dev

* changes:
  Fixed a crash when expanding
  Fixed the visual appearance on heads-up notifications