Merge changes Id81c9034,I49f71f91 into rvc-dev

* changes:
  Do not expand a notification if its guts are exposed.
  Support deep press on notifications.