Merge changes I57fb542a,If2a13daf into sc-dev

* changes:
  Fix the vertical positioning of the text in collapsed notifications.
  Increase the notification height to 88dp