Merge changes I984e796a,I4af61a72 into tm-qpr-dev

* changes:
  Fix muteOnReturn behavior for snoozed notifications
  Allow secondary summaries to wrap in entity header